<<<<<<< HEAD
//
//  22.c
//  test3
//
//  Created by liuyingchao on 15/4/6.
//  Copyright (c) 2015年 liuyingchao. All rights reserved.
//

#include "24.h"
 #include "add.h"
=======
//
//  22.c
//  test3
//
//  Created by liuyingchao on 15/4/6.
//  Copyright (c) 2015年 liuyingchao. All rights reserved.
//

#include "23.h"
>>>>>>> 303beb6e32e7267c8d147b753a05e2fb36c02c35
